From a6a31827bc7575563126d7333c2a718fe21dc4df Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 10 Apr 2020 12:45:28 -0400
Subject: [PATCH] Remove gtk_style_context_reset_widgets

This should never be necessary to call from the outside.
Whenever we fail to update styles properly, it is a bug.
---
 docs/reference/gtk/gtk4-sections.txt | 1 -
 gtk/gtksettings.c                    | 2 +-
 gtk/gtkstylecontext.h                | 3 ---
 gtk/gtkstylecontextprivate.h         | 3 +++
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index f5462d9d5d..98d7fed3aa 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4437,7 +4437,6 @@ gtk_style_context_get_margin
 gtk_style_context_lookup_color
 gtk_style_context_remove_provider
 gtk_style_context_remove_provider_for_display
-gtk_style_context_reset_widgets
 gtk_style_context_restore
 gtk_style_context_save
 gtk_style_context_add_class
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 7139d57460..6ce91b34b1 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -25,7 +25,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkscrolledwindow.h"
-#include "gtkstylecontext.h"
+#include "gtkstylecontextprivate.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkversion.h"
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index 551bee924e..6a310b5c3f 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -903,9 +903,6 @@ GDK_AVAILABLE_IN_ALL
 void gtk_style_context_get_margin           (GtkStyleContext *context,
                                              GtkBorder       *margin);
 
-GDK_AVAILABLE_IN_ALL
-void gtk_style_context_reset_widgets        (GdkDisplay      *display);
-
 GDK_AVAILABLE_IN_ALL
 void        gtk_render_insertion_cursor
                                    (GtkStyleContext     *context,
diff --git a/gtk/gtkstylecontextprivate.h b/gtk/gtkstylecontextprivate.h
index 4074d06a96..f01adc5edb 100644
--- a/gtk/gtkstylecontextprivate.h
+++ b/gtk/gtkstylecontextprivate.h
@@ -59,6 +59,9 @@ PangoAttrList *_gtk_style_context_get_pango_attributes       (GtkStyleContext *c
 AtkAttributeSet *_gtk_style_context_get_attributes           (AtkAttributeSet    *attributes,
                                                               GtkStyleContext    *context);
 
+GDK_AVAILABLE_IN_ALL
+void gtk_style_context_reset_widgets        (GdkDisplay      *display);
+
 G_END_DECLS
 
 #endif /* __GTK_STYLE_CONTEXT_PRIVATE_H__ */
-- 
2.30.2